From d482dea1d7896b31d10435e34fb4c4cc4a749fc0 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Mon, 29 Dec 2008 04:19:56 +0000
Subject: [PATCH] Merge docs inline

svn path=/trunk/; revision=21971
---
 docs/reference/ChangeLog                   |  4 +++
 docs/reference/gtk/tmpl/gtkfontseldlg.sgml | 33 +++++++++++-----------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index e323eddb92..6aaac55e1f 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-28  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkfontseldlg.sgml: Merge docs inline.
+
 2008-12-28  Matthias Clasen <mclasen@redhat.com>
 
 	* gtk/building.sgml: It's <envar>, not <envvar>
diff --git a/docs/reference/gtk/tmpl/gtkfontseldlg.sgml b/docs/reference/gtk/tmpl/gtkfontseldlg.sgml
index 6b44977f6f..3438468ecc 100644
--- a/docs/reference/gtk/tmpl/gtkfontseldlg.sgml
+++ b/docs/reference/gtk/tmpl/gtkfontseldlg.sgml
@@ -54,20 +54,20 @@ fonts.</para></listitem>
 
 <!-- ##### FUNCTION gtk_font_selection_dialog_new ##### -->
 <para>
-Creates a new #GtkFontSelectionDialog.
+
 </para>
 
-@title: the title of the dialog box.
-@Returns: a new #GtkFontSelectionDialog.
+@title:
+@Returns:
 
 
 <!-- ##### FUNCTION gtk_font_selection_dialog_get_font ##### -->
 <para>
-Gets the currently-selected font.
+
 </para>
 
-@fsd: a #GtkFontSelectionDialog.
-@Returns: the currently-selected font, or %NULL if no font is selected.
+@fsd: 
+@Returns:
 
 
 <!-- ##### FUNCTION gtk_font_selection_dialog_get_font_name ##### -->
@@ -80,31 +80,30 @@ Gets the currently-selected font.
 
 <!-- ##### FUNCTION gtk_font_selection_dialog_set_font_name ##### -->
 <para>
-Sets the currently-selected font.
+
 </para>
 
-@fsd: a #GtkFontSelectionDialog.
-@fontname: a fontname.
-@Returns: %TRUE if the font was found.
+@fsd: 
+@fontname: 
+@Returns:
 
 
 <!-- ##### FUNCTION gtk_font_selection_dialog_get_preview_text ##### -->
 <para>
-Gets the text displayed in the preview area.
+
 </para>
 
-@fsd: a #GtkFontSelectionDialog.
-@Returns: the text displayed in the preview area. This string is owned
-   by the widget and should not be modified or freed.
+@fsd:
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_font_selection_dialog_set_preview_text ##### -->
 <para>
-Sets the text displayed in the preview area.
+
 </para>
 
-@fsd: a #GtkFontSelectionDialog.
-@text: the text to display in the preview area.
+@fsd:
+@text:
 
 
 <!-- ##### FUNCTION gtk_font_selection_dialog_get_apply_button ##### -->
-- 
2.30.2